From d2ca374c8985c41b3fa1e9ed22fb7e13c5f69263 Mon Sep 17 00:00:00 2001 From: Nipunn Koorapati Date: Tue, 5 Sep 2017 01:46:22 -0700 Subject: [PATCH] Cleanup debug statements --- src/cargo/ops/cargo_rustc/context.rs | 7 ++----- tests/workspaces.rs | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs index c11cbcfdf..afd36b826 100755 --- a/src/cargo/ops/cargo_rustc/context.rs +++ b/src/cargo/ops/cargo_rustc/context.rs @@ -25,7 +25,7 @@ use super::layout::Layout; use super::links::Links; use super::{Kind, Compilation, BuildConfig}; -#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)] +#[derive(Clone, Copy, Eq, PartialEq, Hash)] pub struct Unit<'a> { pub pkg: &'a Package, pub target: &'a Target, @@ -485,7 +485,6 @@ impl<'a, 'cfg> Context<'a, 'cfg> { // Mix in the target-metadata of all the dependencies of this target if let Ok(deps) = self.used_deps(unit) { - debug!("Mixing in units {:?} to {:?}:{:?}", deps.len(), unit.target.name(), unit.target.kind()); let mut deps_metadata = deps.into_iter().map(|dep_unit| { self.target_metadata(&dep_unit) }).collect::>(); @@ -518,9 +517,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> { channel.hash(&mut hasher); } - let x = Metadata(hasher.finish()); - debug!("Produced hash {} for {:?}:{:?}", x, unit.target.name(), unit.target.kind()); - Some(x) + Some(Metadata(hasher.finish())) } /// Returns the file stem for a given target/profile combo (with metadata) diff --git a/tests/workspaces.rs b/tests/workspaces.rs index 2e7660d16..d7eabcf7a 100644 --- a/tests/workspaces.rs +++ b/tests/workspaces.rs @@ -1530,6 +1530,8 @@ fn dep_used_with_separate_features() { // Build caller1. should build the dep library. Because the features // are different than the full workspace, it rebuilds. + // Ideally once we solve https://github.com/rust-lang/cargo/issues/3620, then + // a single cargo build at the top level will be enough. assert_that(p.cargo("build").cwd(p.root().join("caller1")), execs().with_status(0) .with_stderr("\ -- 2.30.2